Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 21:59:38 +0000 (14:59 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 21:59:38 +0000 (14:59 -0700)
commit74e5643acbf6f8318376859603cc6a4956caa725
tree16bf02185b0a1f46ec0fea8ec2816f170055511f
parentf506475f81cc8909aae3c487c62f5721914fb680
parentb0d8848e4a3a30c59bec99b141b7de509db2491b
Merge from trunk.